Merge pull request #503 from knu/respring
Readd Spring fixing a problem with a git-sourced gem.
Andrew Cantino
共有 3 个文件被更改，包括 12 次插入 和 5 次删除
+ 2
- 2
Gemfile
@@ -108,8 +108,8 @@ group :development, :test do |
||
| 108 | 108 |
gem 'delorean' |
| 109 | 109 |
gem 'webmock', '~> 1.17.4', require: false |
| 110 | 110 |
gem 'coveralls', require: false |
| 111 |
- # gem 'spring' |
|
| 112 |
- # gem 'spring-commands-rspec' |
|
| 111 |
+ gem 'spring' |
|
| 112 |
+ gem 'spring-commands-rspec' |
|
| 113 | 113 |
end |
| 114 | 114 |
|
| 115 | 115 |
group :production do |
+ 5
- 0
Gemfile.lock
@@ -316,6 +316,9 @@ GEM |
||
| 316 | 316 |
slop (3.6.0) |
| 317 | 317 |
spectrum-rails (1.3.4) |
| 318 | 318 |
railties (>= 3.1) |
| 319 |
+ spring (1.1.3) |
|
| 320 |
+ spring-commands-rspec (1.0.2) |
|
| 321 |
+ spring (>= 0.9.1) |
|
| 319 | 322 |
sprockets (2.11.0) |
| 320 | 323 |
hike (~> 1.2) |
| 321 | 324 |
multi_json (~> 1.0) |
@@ -446,6 +449,8 @@ DEPENDENCIES |
||
| 446 | 449 |
shoulda-matchers |
| 447 | 450 |
slack-notifier (~> 0.5.0) |
| 448 | 451 |
spectrum-rails |
| 452 |
+ spring |
|
| 453 |
+ spring-commands-rspec |
|
| 449 | 454 |
therubyracer (~> 0.12.1) |
| 450 | 455 |
twilio-ruby (~> 3.11.5) |
| 451 | 456 |
twitter (~> 5.8.0) |
+ 5
- 3
bin/spring
@@ -7,12 +7,14 @@ unless defined?(Spring) |
||
| 7 | 7 |
require "rubygems" |
| 8 | 8 |
require "bundler" |
| 9 | 9 |
|
| 10 |
- if match = Bundler.default_lockfile.read.match(/^GEM$.*?^ spring \((.*?)\)$.*?^$/m) |
|
| 10 |
+ case lockfile = Bundler.default_lockfile.read |
|
| 11 |
+ when /^GEM$.*?^ spring \((.*?)\)$.*?^$/m |
|
| 12 |
+ version = $1 |
|
| 11 | 13 |
ENV["GEM_PATH"] = ([Bundler.bundle_path.to_s] + Gem.path).join(File::PATH_SEPARATOR) |
| 12 |
- ENV["GEM_HOME"] = "" |
|
| 14 |
+ ENV["GEM_HOME"] = "" unless /^GIT$/ === lockfile |
|
| 13 | 15 |
Gem.paths = ENV |
| 14 | 16 |
|
| 15 |
- gem "spring", match[1] |
|
| 17 |
+ gem "spring", version |
|
| 16 | 18 |
require "spring/binstub" |
| 17 | 19 |
end |
| 18 | 20 |
end |